projects / xen.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2a3e2af) | patch
Fix conflicting merge.
authoremellor@ewan <emellor@ewan>
Thu, 6 Oct 2005 23:21:00 +0000 (00:21 +0100)
committeremellor@ewan <emellor@ewan>
Thu, 6 Oct 2005 23:21:00 +0000 (00:21 +0100)
commit57e576dc3cc61826682f745203cbb817f7242d94
tree01f427699c1f16e4db43fcd1c9e53b3e812a883etree | snapshot
parent2a3e2af26c4461afe878cdd0f0557baec402bfd1commit | diff
Fix conflicting merge.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
tools/python/xen/xend/XendCheckpoint.py diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.